Merge "Fix: End handle disappears when the selection is short." into mnc-dev