Merge "Gallery2: Fix CANCEL and DONE in ExportDialog disappeared"