Merge "Replace Contextual Rotation Button with Floating Action Button" into 24D1-dev