Merge "Enable surfacing of notification children"