Merge "Better handle changing app transitions." into jb-dev