Merge "Fix Editor ActionMode content rectangle"