Merge "Possibly fix the widget restoration bug" into udc-dev