Merge "Grid item fixups."