Merge "Revert "Temporarily disable 'Scan Always' mode"" into jb-mr2-dev