Merge "Add DynamicAvailabilityPreferenceController"