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

* commit '0a77e43d7bb739c660c75c13c6935b2afe6216f9':
  Fix a crash when General Settings is opened