Merge "Fix focus close when rotate phone during panorama capturing"