Merge "Move PreferenceControllers to member variables to prevent memory leak" into main