Tweak grid item layout.  Adjust colors to match spec.

BUG=10960718
BUG=24326989

Change-Id: I74da23fe0b40d713a3f435d1467d26d707e76fca
12 files changed