Merge pull request #16947 from dwi2/bug976986

Bug 976986 - SettingsListener should have unobserve() method