Merge "[DO NOT MERGE] Get legacy recents working for secondary user"