Merge "DO NOT MERGE - Minor clean up: redundant functionality in Editor and TextView." into mnc-dev