Merge "Keep early vsync-offsets for at least two frames after transaction" into pi-dev