Merge "Overdraw avoidance in new pipeline" into nyc-dev
am: 80a67f3

* commit '80a67f363f6ae941c28572ea8420c14c2ce6ef79':
  Overdraw avoidance in new pipeline

Change-Id: I139d5172d2913ecce6f8ab91d5f5b5f34988039a