Merge "Fine-tune the location and style of the reset button in the “Display size and text” page." into tm-dev