Merge "Clear calling identity before calling SysProp callbacks"