jira: STUDIO-13455 Change-Id: I88f48801f443b3830fbd2bccbc53577f615e6d96 (cherry picked from commit 562ac1a3e7e75e1cab5e42ab09cec719bf698184) (cherry picked from commit 5143086c5efb4d974e27ba4f55bd82752ded0a93)
jira: STUDIO-13455 Change-Id: I88f48801f443b3830fbd2bccbc53577f615e6d96 (cherry picked from commit 562ac1a3e7e75e1cab5e42ab09cec719bf698184) (cherry picked from commit 5143086c5efb4d974e27ba4f55bd82752ded0a93)