Merge "Reparent PiP overlay under task as soon as possible" into udc-dev