am 474958fc: Merge "Allow user to change scan always available setting" into jb-mr2-dev

* commit '474958fc670e18347b2135d0ffd118f921ad7ccb':
  Allow user to change scan always available setting