Merge "Allow user to change scan always available setting" into jb-mr2-dev