Merge "Implement fallback line spacing for BoringLayout"