Merge "Revert "Use ArraySet for the list of observer WeakReference.""