Merge "Changes callback to a WeakReference in ActivityContainerCallback." into lmp-mr1-modular-dev