Merge "Apply SBIV LayoutParams when added to NIC" into main