Merge "Remove DynamicAvailabilityPreferenceController."