HeaderView flickers when collapsing

[jhrasco]

The library fixes this issue: http://stackoverflow.com/questions/16909105/uicollectionview-animating-cell-size-change-causes-undesired-behavior

However, when the collectionView has multiple headers, an issue happens where collapsing a section causes the header offscreen to disappear and reappear after the animation is completed.

Here is the video with the animation debug on: https://drive.google.com/file/d/0B5EXlMeZdF31cFBpc3dWbHNaX00/view?usp=sharing

Any help would be greatly appreciated. Thanks.