Merge "Remove vsync injection methods"