Merge "Fix race-condition when window is resized or rotated." into devel/master