Merge "Fix a NPE in Recents"