Merge "[PK Setting] Refine layout for Keyboard review" into main