Merge "Don't call remoteFillService.destroy() until session is removed." into oc-dev