Merge "Fix recent folder list logic and simplify"