Merge "Gallery2: refactor strings" into cm-10.2

Change-Id: I911c4894c04d28b1bf79622b04b045725e124132