am a474dbc5: Merge "Don\'t autocorrect after suggestion resuming" into jb-dev

* commit 'a474dbc5c2e99a6467b0671b30be968f653e248f':
  Don't autocorrect after suggestion resuming