Merge "Fix a crash when General Settings is opened"