Merge "Merge "renderthread: relax error handling for wide gamut EGL configs" am: 50666fa2 am: c1ad3c5f am: 7818322b -s ours"