Merge "Update tests for activity result in stopped state" into pi-dev