(bug 43317) Removed overwriting entity selector's input value

Prevents overwriting the entity selector's input value with an entity id if the matched entity does not have a label.

Change-Id: I5ae064b930e321a23b039c63389f49367025b52c
Merge "(bug 43317) Removed overwriting entity selector's input value"