Merge "Made sure the headsup doesn't disappear after bypassing" into qt-r1-dev