Merge "Add smartspace removal option as a toggle" into main