Merge "Add libraries to record screen when needed" into udc-dev