Merge "Do not use sync on divider visibility changed." into tm-qpr-dev