Bug 9116: Move notification logic to MappingSystem