Merge "clear calling identity before calling settings provider" into oc-dev