Merge "Use TYPE_ENTER_PIP_FROM_SPLIT only if the task is on split" into udc-dev