(bug 43867) Prevent entity selector widget from resetting entity

The change set prevents resetting the selected entity to the first matching item if an item with
the exact same label is selected already.

Change-Id: I6f00a49713b60d7caa58e6466cb511cc0db87648
Merge "(bug 43867) Prevent entity selector widget from resetting entity"