Merge "Also factor the floating rotation button into the active touch region" into rvc-qpr-dev