Merge "Simplified maxPanelHeight logic." into lmp-preview-dev