Merge "Add shouldBeSeamless param to Surface.setFrameRate"