Merge "Show FSI HUN for 60 more seconds after update" into udc-dev