Merge "Fix NPE in PipTaskOrganizer#setPipVisible" into udc-dev