Merge "Fix Settings crash when activity is null"