Merge "Fix TechChange's assumption about TextView targets" into klp-dev