Merge "Make sure to update the selected pages when needed in the right order." into nyc-dev
am: a97415b

* commit 'a97415b0b768194e3153f18a60b9cf9b0d8f8e33':
  Make sure to update the selected pages when needed in the right order.

Change-Id: I484fc75379853a4d9b2764eb4f5798be1d8418c5