Merge "Reset embedded TaskFragment override when entering PIP" into tm-dev