Merge "Fix ContentObserver unregister issue"