Merge "Remove unused remove_npvc_bottom_area_usage flag" into main