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

Change-Id: I5b1e9680e94dab6ce059cabba9d6326f01479530