Merge "Don't show the unlock notification when Work mode is off" into nyc-dev