am 54ede34f: am 8eccd3d4: Merge "Revert call settings switch style UI" into lmp-mr1-dev

* commit '54ede34f68225b5c5a50f8b9accd701a791f37f5':
  Revert call settings switch style UI