Ultra-basic gallery editing

'Cos Erik doesn't like things he can't edit.

Change-Id: I1d9fb1215bb16b1245eddd87c977fb5bfdee4da9
Merge "Ultra-basic gallery editing"