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

Change-Id: I650d6badc8c13ca6edf00578a094d93dbd913213