Merge "Show info icon when RestrictedListPreference is disabled" into nyc-mr1-dev