Merge "Fix idle frame between pre-commit and post-commit phase" into main