Merge "SurfaceFlinger: Some fixes to DispSync" into qt-r1-dev