Merge "add flag to websearch intent" into jb-dev