Merge "Make sure to unregister PhoneChangeReceiver." into oc-mr1-dev