Merge "Fix unregistration of incorrect ContentsObserver" into pi-dev