Merge "Remove the fixed screen size assumptions."