Merge "Fix searched item isn't highlighted" am: 363c529dc6
am: 1d07de566d

Change-Id: I908c237db46ffcca743b66dd1c5fa5b0fab17a06