Merge "Show bouncer after rebooting" into qt-r1-dev am: 95a52f6387
am: 1d76d267d2

Change-Id: If360b668ffe6fdbe6d2fcd19c6c7b1501b8c2a36