Merge "Prevent multiple calls to finish on the recents controller" into sc-dev