Merge "Add docs for new padding/margin attributes." into oc-dev