am 93647e2f: Merge "Temporarily disable \'Scan Always\' mode" into jb-mr2-dev

* commit '93647e2f8f0c1b52d6b8f017096f4f037f9733b9':
  Temporarily disable 'Scan Always' mode