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

Change-Id: Ie8ea7cec050551193b1c0520e349f6552fe0b6dd