Merge "Revert "Fix ContentObserver unregister issue""