Merge "Refactor SystemServicesProxy to manage ITaskStackListener locally" into nyc-dev