Merge "Restore trimMemory behaviour from T" into udc-dev