Merge "Guard against battery tile crash" into nyc-dev