Fix vsync by removing a condition that is always false
Merge branch 'cm-10.2' into martincz