grub2: fix delay update issue
Merge branch 'develop' into dev_grub2