Merge "Properly clean up broadcast-receiver ANR" into oc-mr1-dev