Merge "Fix tests that request screen orientation change" into sc-mainline-prod