Update flow to fix pagination

Change-Id: I77a86d36e36310e479a9a6468511ed5754b1d42b
Merge "Update flow to fix pagination" into wmf/1.23wmf13