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

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