Merge "Fix issue that preferences of call settings cannot be disabled" am: 059205e53d am: 10cf857ac3 am: 5c2226b9c4
am: 829ca52e77

Change-Id: Ia93b1de8e601223336a10f0bd4506d3ac67ff41c