Dear DJ_Peng,

Thanks a lot for your great work. I confirm yours fixed the problem for me!
Still suspend icon is not shown though. Hopefully it will be fixed soon as well