Merge "Add plumbing for upcoming setFrameRate() api"