Visa for Indonesian citizen flying from USA

Hi, I'm an Indonesian citizen who is currently studying in USA. I will fly back to Indonesia and I will have two layover: in Qingdao for 13 hours and in Shanghai for 24 hours (from 17:40 on 7 December 2017 to 17:40 on 8 December 2017). Will I need a transit visa?

Also, is the 2x2 size still valid? Because the new size provided on the website is 33mm x 43mm

Thank you.