Merge "Add flag for smartspace removal toggle" into main