Merge "Fix alignment of wifi dialog"