Merge "Use consistent NSSL margins across devices" into main