Merge "Use OnPreferenceChangeLister for subtype enabler" into lmp-dev