Merge "Track registerReceiver changes" into oc-dev