Merge "Dump shell side transition trace with bug reports" into udc-dev