Merge "Fix settings crash"