Merge "Fix missing declared accessibility PreferenceControllers." into main