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

* commit '535af3345aa5caab4e2b47dd3b1539a301dbab1d':
  Revert "Revert "Exit cab mode when we change folders""