Merge "Fix: Hard to modify multi-line selection." into mnc-dev