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
am: af64ae81
Change-Id: I279a26f23b3f03ee3fc9d47e1cae3539ffb964a9