Merge "NSSL: requestLayout on split shade change" into main