am e9caeafa: am 1fce2b5d: Merge "Reset to default did not reset cached settings"

* commit 'e9caeafa9a953be0cbe974043920d72cec9ddf22':
  Reset to default did not reset cached settings