Merge "Swap star tint." into nyc-dev