Merge "Fix Settings crash on changing device orientation"