Just came across this thread with interest, I’ve got a 16 hour layover in April, Bangkok to London via Pudong. Arriving 10pm in the evening until early afternoon the next day.

A bit daunting but I’ve done similar ones another airports where there’s also not been much to do.