Merge "Allow adb forward to traced consumer socket" into qt-qpr1-dev