Merge "SurfaceFlinger: HWVsync when display is off" into qt-r1-dev