Merge "Fix default TextView gravity"