Merge "docs: Fix a bunch of misc doc issues from external tracker" into ics-mr1