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

Change-Id: Ibcaaf674e1089f25be9f4236e5bbfbfddcb36d1c