Merge "Fix NotificationAssistantPreferenceController constructor" into sc-dev