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

Change-Id: I5d9ba7bfe7d3409f477f20ff9de16a57b313e24d