Merge "Merge "Ensure transparent assistant works with PiP" into oc-dr1-dev am: 8d10791f5b am: 2b9ebbe093"