Merge "Support GONE->OCCLUDED" into main