Merge "IMS: Show IMS UI options only if Ims feature is ready" am: 8a67a3420d
am: a5cb762aac

Change-Id: Ief1aa8fefd08998b69df0e311724d0184201c775