Merge "Account for stopping activities when determining whether to restart" into rvc-dev