Merge "Add new Surface#setFrameRate API" into main