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

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