Merge "Support multiple window rendering" into devel/master