Merge "When un-unifying the personal and work locks, launch lock setup" into nyc-dev