Fix WebGL rendering issue

Change-Id: If9e46d85de5045044b4b8f0396adf4623bea8231
Merge topic 'pvw-fix-webgl-vgl-issues' into next

76d5c64d Fix WebGL rendering issue