Improves WrapperDrawable constant state workflow