Merge "Optimize imports in AppNotificationSettings" into udc-dev