am 900c9a61: Merge "Remove the fixed screen size assumptions."

* commit '900c9a61dee1511c9f4086ea5a3a3632b944cc0e':
  Remove the fixed screen size assumptions.