Merge "Fix hub<->occluded transition when undocked" into main