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

* commit 'db607a6cded8cae1876198ef5f28964dab185eee':

Change-Id: Icb0d03094473c688b9834b92673f34a9e1a73142