Merge "Fix returning an occluded activity below boundary" into rvc-dev am: 9cbcb69d59 am: 3b8cb03121

Change-Id: I412915e653546f176ac2a913474a21e03ec00db4