Merge "Completely remove ExtractActionMode from ExtractEditLayout" into mnc-dev