Merge "Add API to control scan always mode" into jb-mr2-dev