am ebb2c6b3: Merge "Keep shaders to render properly"

* commit 'ebb2c6b36da049b32c1dba6f14f16660d860eb09':
  Keep shaders to render properly