Merge "Guard new occlude/unocclude logic behind aconfig flag." into main