Merge "Use LoaderManager for account changes"