jira: STUDIO-14278 Change-Id: I3d0ee519b7ab057480cfde88be6b52d4f902b522 (cherry picked from commit af66ccee4e63074d4242f05792c1bc927c9ea2f8)