Merge "[incremental/pm] app states and transitions"