Merge "Update colors for list/grid view." into nyc-dev