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