Merge "Fix NPE with registering content listener"