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

Change-Id: Iabee18612977ce86b587724ad7e37b6a3cc6de80