Merge "Don't start SearchDialog on television." into lmp-dev