Merge pull request #11964 from JosJuice/android-hide-infinity Android: Hide Infinity Base in MenuFragment when not relevant
