Merge "[SB] Update StatusBarWindowStateRepository to be for any display." into main