Merge "(de)activating spell check taken into account immediately" into ics-mr1