Merge "Set initial focus for empty remote configuration"