am ccbc2f30: Merge "Fix a NPE in Recents"

* commit 'ccbc2f309e84e9b073e92c1bf689a4d8dab988cc':
  Fix a NPE in Recents