Merge "Partial revert of "Prepare LightBarController for multi display"" into main