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

Change-Id: I4f867e3a205294766c996ae951d30a280cb7eb68