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

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