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

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

Change-Id: I78d809e2acb40a49c17189d41921eec6496c380a