Merge "Keep 4G LTE slider disabled after call" into oc-mr1-dev