Merge "Revert "Add tests for start singleTop/singleInstance activity fo..."" into rvc-dev