Merge "Store ZSL images in correct orientation and show progress in filmstrip." into ub-camera-haleakala