Merge "Move floating rotation button handling to Launcher"