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

Change-Id: I0941d738f0b5d0783ca4271fb6e23956d1e54dba