Revert "Revert "Fixes InputDecorator to work with textScaleFactor, fixes Material Design differences. (#12595)" (#12678)" (#12689)

This reverts commit 72dc7d91.

Re-landing my InputDecorator changes so that I can land the character counter PR.