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

Change-Id: I416014a014c3e0561a9894540cd232dfd33f14ab