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

Change-Id: If874ee56911ac3f603aecf947a3685a195801f76