Merge "Revert^2 "Scrim was flickering on FPS unlock"" into tm-dev