Reduced flushing interval time for preferences
Merge remote-tracking branch 'upstream/master' into flush-changed-preferences-immediately
Fixed logging message
Merge pull request #3137 from ussuri/flush-changed-preferences-immediately

Flush changed preferences immediately