BUG: Better xaxis handling for partial layout
Merge pull request #7457 from sinhrks/axlayout

BUG: Better axis label handling for partial layout