Merge "Use a closure instead of PathRouterPatternReplacer"