Fix crash in Settings from uninstall am: 6e2e8e17cf
am: 34d6ea560d

* commit '34d6ea560d3935eef6e53e93d5bb7ba1a8148965':
  Fix crash in Settings from uninstall