Merge "Fixed rounded corner javadoc rendering issue." into sc-dev