am 587ae34a: Merge "Modifying portals in landscape on the phone UI" into ics-mr1

* commit '587ae34aabc03e607c2ec2b37b8709bdf9cc33f0':
  Modifying portals in landscape on the phone UI