Merge "Try to fix and diagnose Perfetto flush errors." into udc-dev