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