Merge "Remove deprecated 'deactivate_image' feature flag setting"