SMall change to avoid race condition when redisplaying favorites after a save.
Merge branch 'reload-favorites'

* reload-favorites:
  SMall change to avoid race condition when redisplaying favorites after a save.