Merge "Remove special handling of recents" into sc-dev