Merge "Improved the bypass animation" into qt-r1-dev
am: 9177ab6cee

Change-Id: Ia5562709ed98e3049fd18b4a979ac6a379d23c5e