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

* commit '0d4f2b6d9ad1c5980f3ece965c4c4a49726c29f4':
  Remove the fixed screen size assumptions.