Merge "Revert "Run unlock animation on MODE_ONLY_WAKE"" into tm-dev