Minor refactoring and a bug fix in PhotoHandler

Change some strings and fix a bug where timestamp preference
is ignored if watermark annotation is disabled