Merge "Wait for activity in test app to finish before force stop." into rvc-dev