Merge "Updating search asset for action bar" into jb-mr2-dev