Merge fixes for WebGL settings

Change-Id: I1660f81d3a11fad7771ad4c362c375eaef168962