Merge "Draw textShadow always first." into nyc-dev