Merge "docs: Update Button JavaDoc comments" into oc-dev