* commit '78a4348a535e530ae77c0e7777247d495596be7c': DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.
* commit '78a4348a535e530ae77c0e7777247d495596be7c': DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.