Merge "Fix returning an occluded activity below boundary" into rvc-dev