Merge pull request #582 from bhariharan/master

Latest shared
Bug fix for duplicate AccountWatcher callbacks