Merge "Screen recording flakey test" into udc-dev