Merge "Allow activity to be reparent while allowTaskReparenting is applied" into tm-qpr-dev