Merge "Fix connected display dialog overlap with 3 buttons nav" into main