Sprite Scaling Merged

Must be merged manually due to some changes in the scenes and the
prefab.