Merge "Unhide camera fps range API and deprecate old ones." into gingerbread