Merge "Hiding clear all when replying now" into pi-dev