Merge "Avoid calling get/setRnrSetting on older SDKs" into sc-dev