Merge "Apply the settings lib style into the reset button of "Display size and text"." into tm-dev