Merge "Clear calling identity when getting global security state" into main