Merge "Handle different font scale values during B&R" into 24D1-dev