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

Change-Id: I64c8eda596f071c67fdfa2afa541de27b7f4eec2