Merge "Fix theme differences between left/right pane problem" into main