Merge "Override (un)registerComponentCallbacks for ContextWrapper"