Merge "Fix crash while searching in Settings"
am: 176c0c5d98

Change-Id: Iaaf4de39939728e9b2645e119437a9142473a5b1