Removed composition dependency on view model activator.

Also, fixed a recently introduced bug in composition related to
bindingContexts.