Merge "Ensure the layer drawable callback is set when loading from theme" into nyc-mr1-dev