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

* commit '9f250e28c39abfb14a80c1997a1915b97940e070':
  Temporarily disable 'Scan Always' mode