Merge "Cancel show runnable when bouncer is hidden" into qt-r1-dev
am: 859adc665b

Change-Id: I2dbbecf7502b45d4fb4e84b697b5f4a06b4eedf0