Merge "Add missing Material EditText style redirect" into lmp-mr1-ub-dev