As said above, it has not changed, they don't care about carry-ons.
I don't see why you take all your luggage with you and don't check it. Unlike in the US, they don't lose your luggage in China and it shows up on the carousel as soon as you get there. Much less trouble. also understand that in most airports you are not to have any liquids at all in your carry-ons (except for some items for personal use during the flight - which shampoo is not).