Merge "Fix a bug where storage settings flickers." into oc-dev