Merge "Tweak Factory reset page for Material Next style" into sc-dev