Merge "Cache the default launcher." into nyc-mr1-dev