Merge "Fix notifications for USB PD enabled devices" into nyc-dev