Fallback to normal drawable when getConstantState() returns null
Merge branch 'master' into support-libs-test