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

Change-Id: I9ff8a40351e537ea48cc53c532207d25d2a169fc