Merge "Fix handling usb notification after pr_swap complete"