Merge "Fix Scene3D shader cache miss" into devel/master