Merge "Fixing some grid spacing issues. (Bug 10754537, 10754538)" into jb-ub-now-indigo-rose