Merge "Disable perfetto lock for OnSetup/OnStart/OnStart." into main