am 559db66d: Merge "Improve video calling setting visiblity behavior." into lmp-mr1-dev automerge: c0796a3

* commit '559db66dc056466172d5bc8eda405e2da8c399e3':
  Improve video calling setting visiblity behavior.