Fixes #2600. Add a check to see if previous old selected element is still in the new list. If so, that element is the one selected.

Change-Id: Id38d1213fd59c424a21d802cc7204e47df252942