Merge "Merge "Hide floating rotation button upon click" into qt-dev am: 8f5770a0b3 am: 279e47ff19" into qt-r1-dev-plus-aosp