Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev