Merge "Fix alert dialogs in VpnSettings." into honeycomb