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

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