am 3bb98aec: Merge "Fix issue #6730064: When turning off Nakasi, it very often..." into jb-dev

* commit '3bb98aec9344af1299b90d1567b4443e4d50cc91':
  Fix issue #6730064: When turning off Nakasi, it very often...