Merge "Make Panorama work in portrait layout." into ics-mr1