Photo upload tweaks

Insert photo in correct place in beta (#content_0)
Show / hide rather than detach/recreate

Change-Id: I5d2e6af157b386370f7a9cef7b620942b5b8b1ef
Merge "Photo upload tweaks"