Merge "WifiCallingSettings: UI improvement" into nyc-mr1-dev