Merge "Update lock screen messages to match UX expectations." into tm-qpr-dev