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

Change-Id: I984d5a17735eeecf02498305b5e77395d15dd520