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

Change-Id: I9de0660bc63c46b1ab5506afab69649ab45fe5ff