Merge "Prevent NetworkRequestDialogActivity recreation on some configuration change" into main