Merge "Revert^2 "Fix a crash when registering/unregistering a smartspace timer listener."" into main