Merge "Replace sleep() hack with vsync listening"