Merge "Clear calling identity before binding instant app resolver" into oc-dev