Merge "Handle case where finishActivity removes activity"