Merge "Add KeepRendering method to Window" into devel/master