Merge "Grab Activity reference before leaving fragment." into klp-dev