Merge "Add a hidden action to trigger the storage manager settings." into nyc-mr1-dev