Do not remove Icon when changing text (#14536)

Change-Id: Ia4c9be0619eb5a221545b5bf2ae8c48f46f27c1b