Merge "stop incorrectly showing unknown sources prompt"