Merge "Improved the unlock animation when bypassing" into qt-r1-dev