am f9618856: Syncing up state transition with paging transition

* commit 'f9618856d6910ac385ad37762f9f067ae59a8622':
  Syncing up state transition with paging transition