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

Change-Id: Id1d670ace6652d483136bc99359a53860fc35eab