Merge "Remove swap buffer speed feature" into nextgenv2