Merge "Fixed incorrect bug association with aconfig enable_usb_data_signal_staking flag." into main