Merge "Clear calling app identity before device config check"