Merge "Fix "Free up space" not clickable issue" into main