Merge "Disable auto-enter PIP when launching an assistant activity" into oc-dr1-dev