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

* commit 'c0796a35383d86ee8e5b01ea1ad4ea14884a25c5':
  Improve video calling setting visiblity behavior.