studio 2022.1.1 beta4
Merge cherrypicks of [19757942] into studio-ee-release.

Change-Id: Ifde6116e6c7045e9a75ad051d677f25b88b8e69b