Merge "Fix 6216452: Add search target to lock screen"