Merge "Resume CAB mode when returning to folder list mode"