Merge "Fix Recent thumbnails aren't taken when leaving an activity via notification"