Merge "Revert "Revert "Connected display usb errors notification""" into main