Merge "Support multiple surfaces for partial update" into devel/master