Merge "Support another GONE->OCCLUDED case" into main