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

Change-Id: I677d8c88f678ce1af4d76c86fdd8a2d6a854e386