Merge "Revert "Revert "FloatingToolbar: Fix orientation change handling."""