Merge "[PB] Fix typo when migrate PB to shell transition." into main