Fixes
Prefab/Scene Change
Switching Computers
Merge branch 'Jonathan-Cabe' into Michael-Swedo
Revert e8922a2..026ee94

This rolls back to commit e8922a2979c4abdd66473101d27e1074f868fc86.