Merge "Add additional logs for widget restoration" into udc-dev