Merge "Keep off displays in trace" into udc-dev