Merge "Recents: Make sure blacklist checks the package name as well as activity name" into nyc-dev