Merge "Reworks lock screen flows." into nyc-dev