Merge "Add setHasOverlappingRendering() method" into nyc-dev