Fix for zoom when highlighted
Merge branch '_CCButonZoomFix' into v3.1