Merge "Remove resuming activity from stopping"