Merge "egl: fixes for object refcounts"