Merge "Use fallback-based line spacing in TextView etc"