Merge "Improved the unlock animation when bypassing" into qt-r1-dev
am: 16815264dd

Change-Id: Idae198e0483c7e0dd41618be0259e58a1e276e64