Change-Id: Ia5ed59d2acca441030a917ae6867cca70bb2231f Jira: STUDIO-9705, STUDIO-9714 (cherry picked from commit 7bf976babc8d12118200c5ebe8f1df976d269199)