Merge "EGL: remove redundant codes for hibernation"