Merge "Fixed the touch targets when replying" into pi-dev