Merge "Add the jank detection to Settings sliders" into tm-dev