Merge "Hide floating rotation button upon click" into qt-dev