Merge "pixel perfect: Disable controls" into studio-1.1-release