preserve quantity when changing package type/location, #24259