am 78a4348a: am eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant...
am 78a4348a: am eea5a9e0: Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev
* commit '78a4348a':
DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView.