Merge "Modifying portals in landscape on the phone UI" into ics-mr1