Merge "Revert "Keep overflow menu button from closing on changing orientation"" into ub-contactsdialer-b-dev