Disable notify_osd when config is False
Merge remote-tracking branch 'upstream/master'