Merge "Fix searched item isn't highlighted" am: 363c529dc6 am: 1d07de566d am: 85768b3723
am: 051c1b298d

Change-Id: Ib75d421f6b4a4ee97006a3427bb4b1111c5ece2f