Merge "Use subcomponent to add Controller to ActivtableNotificationView"