am f1d4dc38: am db242310: Merge "docs: add Settings dev guide; a few changes to javadocs" into jb-dev

* commit 'f1d4dc3844510eb02cffd49c81ce2ec297758a6f':
  docs: add Settings dev guide; a few changes to javadocs