Merge "Show the face lockout follow-up message after the screen fully turns on." into tm-qpr-dev