Merge "Hiding clear all when replying now" into pi-dev
am: 7cf18d5ec4

Change-Id: Id933193e7e5ef4a834e1d67750fbccb5a68e2d6e