Improved Camera restart handling