am 1d352735: Merge "Fix issue #7202950: After clearing data, clear data button is still enabled." into jb-mr1-dev

* commit '1d3527354396d3aa48b494fb409d680cce32dc8b':
  Fix issue #7202950: After clearing data, clear data button is still enabled.