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