am 784f9e92: Merge "Revert "Exit cab mode when we change folders"" into jb-ub-mail-ur10

* commit '784f9e928f0b1e38f6cc94d7f201258ef573f40b':
  Revert "Exit cab mode when we change folders"