Merge "Fix shader compile crash issue" into devel/master