Merge "Add plumbing for better text scaling"