Merge "Fix bug where pagination animation comes in from outside the folder...

Merge "Fix bug where pagination animation comes in from outside the folder when opening folder after swiping back home from another app (left to right swipe)" into tm-qpr-dev