Merge "Move rotation button closer to the edge of the screen." into qt-dev am: b617827fe6
am: 4d450edb0f

Change-Id: I07318e581df0c16b608677c2d2db273aa41ac6a0