Enable photo upload progress bar 2/2

Change-Id: I6079bb6843115eecae0692b0be7fb92ce0efac67
Merge "Enable photo upload progress bar 2/2"