Merge "docs: Clarified description of height and width attrs" into oc-mr1-dev