Merge "Fixing crash in Recents" into nyc-dev