Merge "Update transient-flags when windows are collected" into udc-dev