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

* commit 'f42e9b1b1e2eeb0e97bfc8d77d1dd24cb21d9e31':
  Overdraw avoidance in new pipeline

Change-Id: I5fa751a4a2a212ef4c805a473d62da41ebaf70ae