Merge "Fix Settings crash when clicking search bar"