Merge "Fix and re-enable QSFragmentTest" into tm-dev