Merge "Support dict values for controller.notification"