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