Merge "DO NOT MERGE Clear calling identity before checking if user is running." into nyc-dev