Merge "Overview - update Clear All and Empty message drawing" into sc-dev