Merge "Flicker test for PiP and launcher shelf height" into sc-dev