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