Merge "Update UI for Storage settings." into nyc-mr1-dev