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

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