Merge "Add GetNativeId() in Window" into devel/master