Merge "Fix bug with drag-to-split involving work profiles" into udc-dev