Merge "Revert "Add NoActionBar to PhotoViewTheme"" into ub-photoviewer-dorothea