jira: STUDIO-11051 Change-Id: I1ca79d708df04ab99d52d04c19454b383fc4a5aa (cherry picked from commit c74cd2a15f112467985b0f431fea8f7dab961358)