Merge "Do not allow switching to other activities during panorama capture. (do not merge)" into ics-mr1