Merge "Fix initialization of display stats on multi-screen devices" into main