Merge "Check for null drawable during LayerDrawable.jumpToCurrentState()" into nyc-dev