Merge "Use new Loader API and properly unregister Observers"