Merge "Fixes a crash in setup wizard when adding a lock screen." into nyc-dev