Nothing I tried made him stop. One day I was taking a picture of him doing it so I could show my husband. Only when he realized I was taking a picture he started smiling. He couldn't stop.
I won't say it is the best advice but it works. It is teaching him that he can control himself.