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

Change-Id: I46f7ec471a80af4b2c0df21dd406180ac2269432