Merge "Collect tasks when windowing mode of parent display changes" into tm-qpr-dev