jira: STUDIO-12517 Change-Id: Icb4b0666f5935110f29c0b224329efbd80ade98e (cherry picked from commit 9b126c6eade3cb0f3e0053e813152fb86841d946)