Merge "Remove onClick when Clear all button not visible" into main