Merge "Fixing crash when ActivityManager does not have a proper thumbnail"