Merge "Fix crash while searching in Settings"