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

* commit '441b3ba5c70bb04951142067ffc51298a78e877a':
  Remove video calling setting (for now).