Merge "Add custom view for toolbar to reposition search icon" into ub-gmail-ur14-dev