Merge "Draw textShadow always first." into nyc-dev
am: 45d6e79565

* commit '45d6e7956544051c06a228755b7fd7c179bcdbfe':
  Draw textShadow always first.

Change-Id: Ic7b600ef444bf58d37203266f3faede21cd50711