Merge "Fix 4689527: Improved curation for Recents + misc cleanup"