Merge "Fix defined DrawableWrappers with proper ConstantState" into sc-dev