#1 clear button, showing button only when text is entered. clear edittext x image
Merge remote-tracking branch 'origin/filter-editor' into filter-editor