Merge "Do not skip wake-and-unlock animation" into tm-qpr-dev