Merge "SF: Moving InjectVSyncSource into it's own class"