Merge "SurfaceFlinger: remove SurfaceControl level vsyncId setting" into sc-dev