Merge "Fix NPE at Storage Settings configuration change" into sc-dev