Merge "Removing a mimeIcon specific for album folders from MediaProvider." into nyc-mr1-dev