Merge "Wi-Fi Calling settings UI update" into nyc-mr1-dev