Merge "SurfaceFlinger: support negative phase offset" into qt-dev