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