Merge "Do not send setFinishTaskTransaction if not swipe" into main