Merge "Show proper icons for SD and USB attached storage." into nyc-dev