Merge pull request #11521 from t895/adjust-grid-options Android: Simplify the grid options dialog fragment
