Merge "Consolidate handling occluded initializing activity" into sc-v2-dev