Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1