Merge "Update the panorama capturing progress correctly." into ics-mr1