Merge "[NGA v2] Reliable Visible Activity Lookup" into sc-v2-dev