Merge "Fix window cast crash issue" into devel/master