Merge "Ensure we have an EGL context when building layers Bug #5638421" into ics-mr1