Merge "Trims Recent Task when Task windowing mode changed after dismiss split-screen" into udc-qpr-dev