Merge "Collect embedded TaskFragment window changes" into tm-qpr-dev