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

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