Merge "Finalizing lock-to-app UX" into lmp-dev