Merge "LayoutLib: Fix EditText rendering" into lmp-preview-dev