Merge changes I96574a79,I74681222 into main

* changes:
  Fix the testcase failed
  Add the log for SidecarFragment