Merge "Fix FragmentManager.FragmentLifecycleCallbacks scope"