Merge "Cancel future HUN lifetime extension after action press" into udc-dev