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

Change-Id: Icca155b927edadee0bf5607d02ee6ee4b5422d26