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