Merge "Disable the buginfo dialog on AndroidTV"