Adding dark theme, some translation cleanup, increment Android Maven plugin version.
Resolve merge conflicts.