Merge "Enabled actions in the photo viewer." into jb-ub-mail