Merge "First commit of the native photo viewer." into jb-ub-mail