Merge "Improved the bypass animation" into qt-r1-dev