Merge "Fix TaskFragmentTrustedModeTest" into tm-dev