Merge "Fix two-panel issue in tablet" into main