Merge "Make sure the secondary TaskFragment is above the primary" into tm-qpr-dev