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

* commit 'c2656a98cebab37454c9205b3f4a4ab6afb511a2':
  Revert "Temporarily disable 'Scan Always' mode"