Merge "Fix sleep during launch animation resulting in a unlocked device." into tm-dev