Merge "[SurfaceFlinger] Don't touch hw vsync in DEFAULT RR with kernel timeout" into qt-r1-dev