Merge "Fixing scrims jumping when media player state changes" into tm-qpr-dev