Merge "Revert call settings switch style UI" into lmp-mr1-dev