Well if baby cries when undressed, try getting some nice material to swaddle instead.
You will need to be very, very patient. Try undressing the baby, wrapping in a blanket tight, then when he/she is sound asleep, laying on your prop. The leave it for a bit. Once you know he/she is settled...