Merge "FloatingToolbar: Fix orientation change handling."