Merge "[DO NOT MERGE] Get legacy recents working for secondary user" am: 786e7f34fa
am: 67a8fa0ff7

Change-Id: I846ecebd5afabf48c0dea4c8e8efb90742b77b5d