Merge "Improve animation from keyguard shortcut" into tm-qpr-dev