Merge "Fix launcher side callback" into nyc-dev