Syncing up state transition with paging transition

Change-Id: Id91e4c046cfe7d9aa6e7de10dbf57ee727ba160e
5 files changed