Merge "Reduce flickers when launching Storage Settings" into sc-dev