Merge "Restore specific colors for floating rotation button" into udc-dev