Merge "Do not show user locked notification after reboot when there is no lock" into nyc-mr1-dev