Merge "Clear calling id before binder call"