Merge pull request #11295 from t895/onlayout-fix Android: Fix condition where we set grid span too early
