Merge "Revert "Enforce that RuntimeShader is only hardware accelerated""