Dodgers activate Max Muncy from injured list, but also put Tommy Edman on the shelf