Merge "EventThread: wake for two frames after vsync request by default"