Merge "Fix AppCompatTextView not using the default style" into lmp-mr1-ub-dev