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

Change-Id: Ia53916c83292a702533bb336741c2ac8b32eab92