Merge "Voice search icon replaced by X on typing."