Merge "Guard against null bitmap path" into nyc-dev