Merge "Unbundle Companion Device" into rvc-qpr-dev