Merge "Fix text alignment in supported links dialog." into pi-dev