Merge "Clean up useless defender dialog code" into tm-qpr-dev