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

Change-Id: I825dc7ac4665d18d4e00322f2cf2146e14429b0e