Merge "Fix disappearing HUN when drag down from heads up" into rvc-dev