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