Merge "Removing duplicated code in Recents"