Merge "Hide SearchView icon when no drawable set"