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

Change-Id: I5d7397fa9bdbf8e527daebcc6d27dd0a60cc39c5