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

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