Merge "Replace Contextual Rotation Button with Floating Action Button" into main