Merge "Remove EGL Hibernation"