Merge "Handle configuration changes in floating rotation button" into sc-v2-dev