Merge "Do not reset the recent folder list on folder access."