jira: STUDIO-7378 Change-Id: Ib6b5dbd3b113981612b05e01e59f62054ff0b654 (cherry picked from commit 37120830a2f958f464719db1f5d0180882bc4095)