Merge "Fix recents thumbnail wrong while swipe up" into tm-dev