Merge "Clip buffer damage to viewport bounds" into nyc-dev