Merge "EGL: add deferred saving of the cache" into ics-mr1