am 53083ab2: Instantiate correct classes for tap&say settings.

* commit '53083ab2bbcadf7f1bcbefbaa2e4ee5c85349d84':
  Instantiate correct classes for tap&say settings.