Merge "Change the "Restore" button to "Reset"" into udc-dev