Merge "Stop task reparenting when enter/exit PIP."