Merge "Make OnBackInvoked callback a WeakReference." into tm-dev