Fix failing test.
Fix unique key generation to actually be unique.
Merge branch 'master' into dynamicScene-es5-properties