Merge "Update colors for list/grid view." into nyc-dev
am: 18bbea9

* commit '18bbea9c96dabe0960204ed24155f0fbf69c98a2':
  Update colors for list/grid view.