Merge "Updated storage display colors in Settings" into honeycomb-mr1