Merge "Clear occluded transition flag if it becomes visible" into main