Patches up the themes for Grid a bit (#13334)

Change-Id: I1231b8097d06d8230ddee640894ceaf749dab0ee