Merge "Fix status mismatch in TunerCallbackAdapter" into udc-dev