Merge: from demo_3p_camera_fix - Bugfix for 3p camera spazzing out in client demos Tests: played back a demo and switched to 3p and back