Merge "Tweak splitshade nssl positioning" into main