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

* commit 'ac26a7c42776e0feb2a30729ba178169e33dc927':
  Draw textShadow always first.

Change-Id: I6c5d8f8a5f08359fbd1bd2fe9b9ab152f7465475