Merge "Fix bug #5544127 TextView regression in ICS when setting TextSize dynamically"