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