Merge "Change mid-upload 'cancel' button to 'back'"