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