Merge "Fix issue with floating rotation button being in the wrong corner (launcher)" into tm-qpr-dev