Merge "Hide Wi-Fi and Video calling preferences if IMS service is not ready" am: 14016104e5
am: 9c64f271bf

Change-Id: Ie48cc897b345b4fdfe1faaf460feca2acc7b2d56