Merge "simplify further vsync handling" into jb-mr1-dev