Merge "Fix insertion handle disappearing in extract mode" into mnc-dev