Merge "Make sure that QQS is invisible on lock screen" into nyc-dev