Merge "Update restricted list prefrences before dialog creation."

        // Set ComparisonCallback so we get better animation when list changes.

        getPreferenceManager().setPreferenceComparisonCallback(

                new PreferenceManager.SimplePreferenceComparisonCallback());

        // Upon rotation configuration change we need to update preference states before any

        // editing dialog is recreated (that would happen before onResume is called).

        updatePreferenceStates();

    }

    @Override