Merge "Ensure the layer drawable callback is set when loading from theme" into...
Merge "Ensure the layer drawable callback is set when loading from theme" into nyc-mr1-dev am: 709f0f3e
am: 352ccc9f
Change-Id: I894a043c05320ee7444ab7caad207652d6bae18b