Merge "LayoutLib: Fix EditText rendering [DO NOT MERGE]" into klp-modular-dev