Merge "Rename search bar corner radius dimen to allow oem override"