Merge "Fix pressing back on bouncer" into qt-dev
am: e3e8746e47

Change-Id: I2a8f1c2b082efbb23b9289ac631f0e95cdc60e86