Merge "Use isSplitActive vs visible when detecting mixed pip/split" into udc-dev