fix overlap issue in column & row lock

cell in locked column and locked row will be overlaped when scroll
vertically
Merge branch '1.3develop' of https://github.com/oria/gridx into 1.3develop