Merge "Fix a surface resize issue" into devel/master