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

* commit '6ea2faf8ca7e1d7f75e41c9b13d36fa47436e1cc':
  Revert "Temporarily disable 'Scan Always' mode"