am e7f7643c: am 6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs.

* commit 'e7f7643c485ed6926bc354ca28628d5179019b50':
  Stability fixes for Settings. Asynchronous callbacks causing NPEs.