Merge "More storage UI updates." into mnc-dev