Merge "Revert "Scrim now only scales horizontally"" into tm-dev