am 6c8c5503: Merge "Remove video calling setting (for now)." into lmp-dev

* commit '6c8c5503814b91a2dcb2dad63603ee721610e4e8':
  Remove video calling setting (for now).