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

* commit '6403663343e6ef1962f0f5e1490d975cbcc653a2':
  Revert "Temporarily disable 'Scan Always' mode"