Merge "Fix AppCompatEditText's context wrapping" into lmp-mr1-ub-dev