Merge "Fix for "editor gets grayed out" issue"