Merge "Move grid checking into the layout algorithm." into nyc-mr2-dev