Merge "Don't set the Wi-Fi dialog to the topmost UI" into main