Merge "Add FragmentLifecycleCallbacks"