am 3a229e6f: Merge "Fix a crash when General Settings is opened"

* commit '3a229e6f71ffe1004304ad1a9fba17621106b0ab':
  Fix a crash when General Settings is opened