Merge "Merge "Fix rotation button background not showing after first boot." into qt-dev am: 19f2034a8f am: 78bb50178d" into qt-r1-dev-plus-aosp
am: e997acd693

Change-Id: I42f31a1e2bd84c08e3fe839099c2875679537235