Merge "Fix Recents regressions"