Merge "Remove rifle (1F946) from emoji font." into nyc-dev