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