Merge "Fixed missing includes in shader test cases." into devel/new_mesh