Merge "Fix null exception on config change when ScreenDecoration is disabled"