Merge "Handle auto-pip change in split handling transitions" into udc-dev