am 22808603: am ae2207a8: am 3f950065: am 2aeb1778: am f9618856: Syncing up state transition with paging transition

* commit '22808603a92a75356d4419036644ff745b66afd2':