Patch #21, Working fine and fixed the layout shift issue.
Adding after patch ...