Merge "Handle the uncontrolled task in split-screen" into tm-qpr-dev