Merge "Remove 'deactivate_image' config options"