Merge "Uninstall test apps in-between tests" into sc-dev