Merge changes from topic "b:140112642:2" into qt-surfaceflinger-dev

* changes:
  [SurfaceFlinger] correct present time for negative phase offsets
  SurfaceFlinger: HWVsync when display is off