Merge "Fixes unable to start recents activity" into sc-dev