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

Change-Id: Iefdfe0a49c207e508d935eca8763074aade4c2c6