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