Merge "Add config to show an alert dialog for video charges"