Merge "Make screenLayout calculation consistent"