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

* commit '1f9aed5fb222bbca1acbc8fa4a9f8e4cd5383189':
  Fix a crash when General Settings is opened