Merge "Notification Privacy should require lock screen feature" into tm-dev