Exit cab mode when we change folders

We were previously only doing this on two pane.

The problem with one pane is that we call onFolderChanged() when we
come back from conversation view, so we need to ensure we only exit
CAB mode if the folder has actually changed.

Bug: 9611402
Change-Id: I033d9af9e5bfff43075a5e3ed49942621b44a7c7
2 files changed