Fixed graceful exit when changing camera mode
Fixed merge conflicts