Merge "docs: small fixes for Support Library Guide" into jb-mr2-ub-dev