Merge "Fix crash if drawable doesn't have constant state" into nyc-mr1-dev