Merge "Fix difficulty grabbing handles for small selections" into mnc-dev