Merge "Hide floating rotation button upon click" into qt-dev
am: 8f5770a0b3

Change-Id: I6567861faf3c98127b463ba6314a69b17b592ba4