Merge "[PM] Add more logs to debug the flaky test" into main