Merge "Update wording of onTimeout javadoc." into main