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

* commit '62516190df7d8c35a73bd1e49da9e22c94cf23e8':
  Fix a crash when General Settings is opened