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

Change-Id: I41decedad21593dcdd27af320630f071f51b86ea