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

Change-Id: I4804db79c819c3266fd72b7f9c2185ba2b2f43da