Merge "Add storage manager settings activity." into nyc-mr1-dev