Merge "Ensure transparent assistant works with PiP" into oc-dr1-dev