Merge "Fix bug 5279720 - Legacy theme EditText coloring"