Unnecessarily cursor appears in omnibox after clicking inside the 'Search box'

ui/views/controls/textfield/textfield.cc

Index: ui/views/controls/textfield/textfield.cc
diff --git a/ui/views/controls/textfield/textfield.cc b/ui/views/controls/textfield/textfield.cc
index 01a666be628b77420bc5d76c902de3877e681d9f..342e5137acd96751d31e38a57289bd3b1e7aefce 100644
--- a/ui/views/controls/textfield/textfield.cc
+++ b/ui/views/controls/textfield/textfield.cc
@@ -1909,8 +1909,8 @@ void Textfield::UpdateAfterChange(bool text_changed, bool cursor_changed) {
     NotifyAccessibilityEvent(ui::AX_EVENT_TEXT_CHANGED, true);
   }
   if (cursor_changed) {
-    cursor_view_.SetVisible(ShouldShowCursor());
     UpdateCursorView();
+    cursor_view_.SetVisible(ShouldShowCursor());
     if (ShouldBlinkCursor())
       StartBlinkingCursor();
     else
@@ -2067,7 +2067,7 @@ void Textfield::OnEditFailed() {
 
 bool Textfield::ShouldShowCursor() const {
   return HasFocus() && !HasSelection() && enabled() && !read_only() &&
-         !drop_cursor_visible_;
+         !drop_cursor_visible_ && GetRenderText()->cursor_enabled();
 }
 
 bool Textfield::ShouldBlinkCursor() const {