Merge "Ensure layer update include the dirty rect from AVD" into nyc-mr1-dev