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

Change-Id: Ic50ad039b36c56814e675936e49bb904a790ed9c