Merge "Change the style of cancel button in Panorama." into ics-mr1