Merge "Update javadoc for setFrameRate" into sc-dev