Big code merge from CM

Contained within are optimizations and localization fixes, along with an extra helping of translations.
Subjectively, the app runs much smoother post-merge, so the optimizations seem quite successful.