Merge "Re-enable emoji font tests" into nyc-dev