Merge "Remove bubble options from notification_info xml"