Merge "Fix rotation button background not showing after first boot." into qt-dev am: 19f2034a8f am: 74fb13d178
am: 95a1e841b9

Change-Id: I861b4ea6b450f6cd1299f41bfccee9711600395d