Merge "Fixed the touch targets when replying" into pi-dev am: d450c4bcdd
am: f5ad45f0ee

Change-Id: I173a86665aea690cc210f45bbd811ce3ce2b6918