Merge "Fixing scrims visible in split shade on lockscreen" into tm-qpr-dev