Merge "Fix unexpected starting window removal timeout when in fixed-rotation" into udc-dev