Merge "Merge "renderthread: relax error handling for wide gamut EGL configs" am: 50666fa217 am: c1ad3c5f29 am: 7818322b62  -s ours"