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