Merge "Track TextView locale changes if not explicitly set"