Merge "Do some minor cleanup of SearchView icons" into jb-mr2-dev