Merge "Make wifi dialog persist after orientation change"