Merge "Support multi-launcher" into nyc-dev