Merge "Improve panel appearance with max display and font scale" into main