Merge "Fix crash from Settings Search"