Merge "Remove lazy_variation_instance flag" into main