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

Change-Id: I57e09b8403422338c80bd369d41822bf26383361