Merge "Disable EGL hibernation due to jank" into jb-dev