Merge "Fix LauncherInstrumentation for OOP tests from gradle" into tm-qpr-dev