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

        mPreferenceController.onLoadFinished(mAppsResult.get(UserHandle.myUserId()));

        updateSecondaryUserControllers(mSecondaryUsers, mAppsResult);

        // setLoading always causes a flicker, so let's avoid doing it.

        if (getView().findViewById(R.id.loading_container).getVisibility() == View.VISIBLE) {

            setLoading(false, true);

        }

    }

    @Override

    public int getMetricsCategory() {