Merge "Create a seperate instance of StatusBarModePerDisplayRepository for every display" into main