Merge "Avoid waking EGL in getInitCount"