Merge "Fix display size calculations in large screen (2/3)"