Merge "Flag-guards changes to status bar and lockscreen."