Merge "Fixing tiles on lockscreen and scrims transitions with QS expanded" into tm-dev