Merge "Revert "Create a VsyncSchedule per display""